Changes made on bug3 branch

Fixing a bug. Bug-3