Fix numeration of callbacks