Fix for cell highlighting bug