fix the common issue