Fix path short circuit