Fixed Bugs [Surinder Sammy]