Fix wrong info and order