Issue1 fix
Fixes #1