Bug fix for list ordering change sometimes