Small perf. improvement