Platform tunneling fix