[BugID: 18806] Fixed the bug