Fixed build order of modules