Always close with 'cancel' method

So that the onCancel callback is useful. Fixes #142