duct-tape-fixes (25)