Fixed wrong build order