tag_and_push fixed