Include Peter Scott's fix for multiple windows.