Fixed the build order