Second Try to fix the buildscript