Yet another small optimization