Added hotfix for _addSuccessListener