Add small optimization