Issue 74

Fix for issue #74