[FIX] Issue #2064