Fixes #2 issue