minor optimization for previous commit