Bug fix for ReceiveContext