Fix for #2327