Update
Fixed multiple windows issue