Fixing jpsall