Fixed most of 1D