resolved VSAFE-122