Really fixes #115