duct-tape-fixes (30)