Correct bugs
Bugs correct