EntityConverterHandler fixed