Fiexed bug #5502