#4 Tentative fix for crash