duct-tape-fixes (9)