Fixed cell highlight i guess