Issue #143: Use Promise.resolve() instead of a dummy Promise