duct-tape-fixes (24)