let's try this again. fixes #1