Move fire callback to end of _update function