Fixing bugs...Swathi