duct-tape-fixes (29)