didn't catch all case issues before