fixing issueS