Fix: do not override image choice