Accepting Long's pull request