Added Version checking to fix JB bug