PROBCORE-596 properly explore states