Fix first build