fixed another NPE