jid key not clearing
reverted to previous logic
re-added workaround