7 Years Ago
Fix hang on close