Update offset prefix map

This should address issue #5382