Fixed order of wrapped callback to report finished after the callback in case the callback adds anoter entry