fix simple variant mode handling