Fixed issue with finished callback