Fixes #4926

Fixes #4926