final fix for #1106