Fix for invalid cross-device link (issue #3)