improve usage of unsafeGet