#9 fixed NPE