duct-tape-fixes (33)