- fix for issue #61
- fix for issue #140