restored original dispersy behaviour until tunnels are fixed