Solved issue #64