Fix issue in MessageReturnValueHandler