- fix for issue #55
- fix for issue #58