Issue 78

Fix issue #78