One more try. Fixes #3