fix email address
tweak around_dispatch, to be able to use container