Added a fix for #3204