Bug fixed #4