Merge "Fixed for bug 1197"