Update fix for #926 for 3.0 codeline