fixing NPE