Fixes #5162

Fixes #5162