Fix issue....almost maybe