Fix enabled tunneling bug