Fixed bug when used without tags