Keep-Alive fix