Fixing issue with collection and map converters