fixing-window-locks0657 (Tommy Seyler)

Following