Fixing #60

Issue #60