Small performance upgrade