Update of jlinda subref - unwrapping