fixed glasses

Probably needs testing, but for me works like a charm
#2742