think this is my final fix, I really hope