Minor crash issue fix