Changed a potential bug