Issue 77

Fix issue #77