Fix for tag changing