COMMON: fix choice regression