Small perfomance upgrade.