fixed bug number 12134234234