Bug fixed #13