Bug fixed #48