fixing issies