Attached fixed patch Reproducible: Always
Created attachment 371544 [details] new patch
Looks like okias already fixed this. Thanks okias!