Fixing chat application