Fix for WSOD on install