possible NPE fix