Also fixes #3