Fix for crash