redo fix for #1109