BUG FIXING- 1