Fix for JIRA GDP-806

Please see the JIRA for detailed information about this code change.

https://internal.cida.usgs.gov/jira/browse/GDP-806

PAR