Fixes #5192

Fixes #5192