Handle jid properly
1.0.5