Bugs correction...