[FIX] Fix issue #3