Nasty fix for uat checker - Review it