No need for this once #20 is merged