duct-tape-fixes (8)