Code

Apply fix for #4170