Bug fix for request/reply mechanism