fixing-window-locks4488 (Vivien Morrissey)

Following