duct-tape-fixes (13)