minor optimization
minor optimization