Fixed added promise and started listened tracking