I think the final fix(I think = I hope)