fix for possible NPE