[FIX] Issue #1884