better fix for #1106