Fixes #1 issue