Fix broken stop function and correct callback call
Fix broken stop function and correct callback call