Fixes up tags problem