duct-tape-fixes (23)