Fixing some bug...

No comment......