Fixes #1

Attempt to fix part of issue #1