Bugs fixed !