Fix for UAT