change literal to expression
fix menu