initial fix for #1106