Added edge case for testing, fixed edge case