duct-tape-fixes (28)