switch: fix for normalizing address