Fix issue #1

This should fix issue #1