Tag: fix high memory usage