Almost there. Fixes #3