Fix for UAT 05/09/2013