fixed bug no. 7