Handle the deferred a little better.