Improved fix for #2570.