Fix #4489

Fixes the issue #4489