Fix order of options