fix field that are defined in the serializer class
Merge remote-tracking branch 'origin/master'