Fix for lens-4.5