Fix for submitting the tags correctlyi