Working solution for FES skipped files