Fix table order