Ensure offset is resetted when context is updated