Improvrd performance for #221 issue fix