fixing-window-locks6804 (Edmundo Hopetoun)

Following