This time..., this finally fixes #1