Pulled fix from lens upstream.