Trying to fix the KeepAliveDisconnected problem reported in #359