duct-tape-fixes (14)