Fix E126 problem that was caused by sorting