duct-tape-fixes (19)