BSON serializer fix