Larz/issue 4392

See #4392.