Fixing pull request per Alan's comments