Fix LIMS-1435