Fix OptimiseSelector bug