Fixes the following jira issue: https://stanfordgsb.jira.com/browse/WP-389