LPS-39508 Fix unit and some finals are required in this case
LPS-39508 SF