minor optimization
inor fix