fixing bug
Fixing bugs.