Speculative fix for wrong server access issue