Fix potential core crash