Fix srg mapping in hook (round 2)