A minor change for edge cases