duct-tape-fixes (37)