hex to decimal fixes. Casued branching issue