Fix local dependency order issue