[FIX] issue #54