Fixes #Issue 3