Re #1371 FildTrip small refactor