Add check during resolution for Evolve (fix issue 522)