Fix for lens changes.