* fixed potential crash