Make this directive more “async friendly”

This is an attempt to amend issue #80