Fix: crash issue