Fix for ordering mess up