fixed potential NPE