fix: offsets and lens shift resolved