fixes with empty jid