First step in fixing #1
Fixes #1