Fixed issue DATAREST-82