Added choice fix