Final fix for noChoice