Temporary fix for NPE at converter
Refactoring begins