Better fix for scenario extents check