duct-tape-fixes (15)