fixed bug number 29