fixed bug no.2