LPS-22792 SF - first get, then set