Minor speedup