Fix to support UAT on 04/09/2013