DRY the previous change