Removed the  hack in templates