I would like to fix

Bugs