Kesem(#21):Another bug fix
I hate this method....