Fix for #3346