Fix for "fieldDescriptor does match message type"