Fixes #4
Fixes #4