Fixed buildstep builder