removed clunky workaround in tagging hack