Fixes #2
Fixes #1