Fix the package order