Fix the prefix order