Solve issues #3423 and #5374

I was about too, I leave in few minutes