IMPORTANT -- Fixed issue unable to connect by client