Fixed up potential edge case