Finally think I fixed this