Adding intial handshake fix for OF14: