Fixed build order