Fixing keepalive timer