Fix #454: layout of adresses