Fixed
Merge pull request #140 from mjmeans/DATA-2130

DATA-2130