Ref #219: Fix "then()"