Resovled issue #57