Minor fix (STILL CRASH)