Updating issue #62