Fixed potential problem with late JIP