duct-tape-fixes (32)