Bug fixed #1