Fix  - return promise