#ticket#321p2 fixed bug