Fixed bug in setup and template tag