Fix case order