Really fixes #54, this time.