Small optimization...