fixed issuess