Fixed tag problem
Merge and bugfix