Solved issue #57