caught some more edge cases