Addressed callback execution order regression, fixes #88.