- fixed #98
- fixed #96