Don't forget to check against the primary address!

see #552