Fixes SSEER-71 and Fixes SSEER-121