[FIX] Issue #5