Fix for crash, maybe