1293 Fix variable
1294 Renew screen build process