Really fixes #3