imporved check for build language