Fix for #3331