Really fixes #45