Added fix for bug 1