Properly handle JIDs