Fixed callback nesting madness