Fix issue #52
Fix issue #53