Perf issue with publish hack