Fix LIMS-1532