Fixed street number workaround