Fixing no-choice cases