Improved fix for #3094