Fixed bug with switch links
Fixed bug with switch links