catching some edge cases