Fix: Use scopes in promises