foggy-window-fix3161 (Nam Nutt)

Following