fixing NPE maybe