Fix issue TMART-258