fix for undefined current_tag