small change to cover some bug in choices loading