update converter to fix NPE