Fix order
Add dist