Fixed the default behaviour of @FiledMap