[FIX] Issue #4424