BugID: 10 fixed

BugID: 10 fixed