fixing issues thingy