foggy-window-fix6360 (Emelia Orlandi)

Following