removed prevent NPE fix