duct-tape-fixes (20)