fixing some old issue