Fixed Bug-2