general fixing and new single-trip map