Handle some edge cases correctly.