Attached patch fixes the problem for me.