Adjust to use i-promise, fixes issue with es6-promise