fixed PJ problem