Fix DATA-2004
Merge pull request #60 from Manichee/DATA-2004

Fix DATA-2004