duct-tape-fixes (17)