fix issueses