fixed all issue