Fixed stop call after rebase