Fixed the callback queueing in the 974108 pull request :-)