Fixed: #1997  Avoid use of then() on promises