Fixed issue with PM using still old window