Hoping this fixes sorting bug