Fix for no primary address