Marc: Combox box bug fixed