#19 small optimization.