Bug fixed #48

Bug fixed #48