Guard against overflow / wrap around of internal bit address

Guard against overflow / wrap around of internal bit address #1236