Resolve issue #63