Fixed cell reuse issue