Don't get so excited, this finally fixes #1