#17 dependency order is now also maintained