Patch up Pull Request 1