Fix keepalive
Merge pull request #705 from godarklight/fix-keepalive

Fix keepalive