TRQ-1639 Hot fix for Univeristy of Florida.