Bug fixed #79

Fixed #79