Change resolver again to have better behavior