duct-tape-fixes (2)