Fixing https://opensource.ncsa.illinois.edu/jira/browse/SEAD-613