making address decoding safer