Review and confirm issue #63