Fix sp issue