This change makes a lot of sense. I always find these edge cases pretty interesting.