apply fix to tag entry as well