Trying to wrap up and close issue #470