Minor optimization change