Quick fix for crash I introduced