I tested the 21mm 2.8 Leica-M today on my scarlet-w. Doesn't fit either sadly enough, rear element hits the olpf. I'd really like to have a 21mm for my camera. I am considering grinding a bit off the 21mm's rear element, probably won't be more that 1mm. Does someone have a better idea?