fix the all issue