replace raw option with generated var