Solve issues #3423 and #5374

Did you push the changes?