Fix calling wrong opts too soon