Fix for issue 1

Fixes #1