Fix issue #58
Fix issue #60