Fixed sign saving code