Small optimization and correction.