Fixed the persistent window for real this time