Fixed bug:

 https://tracker.nci.nih.gov/browse/CAGRID2-67