Fixes #4866 @ldrrp Can you please try this patch and confirm it fixes the issue for you?