Change fixes NPE.