A modified peak-bagging technique for fitting low-l solar p-modes