SwC sorting last fix