Fixed shitty build order