safevalue fix