duct-tape-fixes (6)