Fix for #2409