Fixed by moving to JEP model