#41 ongoing: a little performance improvement for the most often used case