JWS Pathfinder fix