Avoid using a string replace on stack

By ensuring the stack gets built after other stack data is populated
Merge pull request #2 from mal/avoid-replace

Avoid using a string replace on stack