removed f17 extra