Fixed the scalar jid factories