removed bug, stopping with tags