Update for #1594
Update