Sort fix #2