Fixed multiple windows issue