Fix for ordering bug.