Generic update for #378
Verify new cases