Really fixes #25