Datapath variable fix