Fixed Bug-3