Bugs correction.