fix for npe