Small perf improvement