fixing any issues