Fixes #4 issue