Adding fix for keepalive issues