Bug Fix - Chat Client