Use tags correctly when set as a function.
Merge pull request #738 from arnar/master

Wrap tags correctly when passed as a function.