Changed callback order