fix DATA-2014
Merge pull request #61 from Manichee/DATA-2014

fix DATA-2014