Fixing keepAlive timeout not passing client