Hopefully this fixes the issue with recipient lookup