Fix addressing controller config

Fix issue #1548