- Fix potential crash