duct-tape-fixes (36)