duct-tape-fixes (16)