Added check on Stop