correction on template listener (works now with every bundle)
correction on use