Trapper guarded fix