Fixed create-tags