Incremental fix for #658
Cosmetic