fixed macro expansion
changed macro syntax to %{} instead of $()