Bugs fixed !!