Fix for #3340