Use scalar add(...) for window_size=1

Use scalar add(...) for window_size=1 #662