Solved issue #92