Fixed cell higlighting behavior.