Code

Apply fix for #3867