Issue #79: Using discovery mode for static addresses