fixed broken dependency order