finish-callback fix