Added jpf checking