Fix as recommended by Jordi on LIMS-1412