[FIX] Fix issue #4