duct-tape-fixes (1)