Updated for lens >= 4.0.7