Finished callback wrapping