Added small optimization.