Add check on serializer