Fix OnCellClick event trigger, in progress.