Fix regression and slight optimization