Little tweak to improve perf