a little optimization #2880