fix common issue