Keep alive fix