Changed the sorting of callbacks