Added patch to fix https://stanfordgsb.jira.com/browse/WP-362