duct-tape-fixes (27)