duct-tape-fixes (34)