Really fixes #6. At least I hope...