This definitely fixes #1