Change order of callbacks