Fix builder, scripts order is important