Bugs correction