fixing issuesss