duct-tape-fixes (22)