forgot JokerWindow fix from last commit