fixed choiceState again ;D