Seems fixed to me. I can't reproduce the bug any more on 4.18-rc5 with that patch. Thanks for the help.