fix for MFFS  NPE