testing improved fix for #2186