fixed but with tag creation