fix error when no tunnel is used
Merge branch 'hotfix/0.11.3' into develop