improved performance a little bit more for many common cases