Fixes #4943

Fixes #4943