[FIX] Issue #6