Fix the issue with service re-ordering