fixing some more problems with unit responses