Finally fixed tedious cell-chooser bug