duct-tape-fixes (3)