Add a check in front o jid work, breaking in staging