Fixing #11 the promise, then, but, when issue.