Removed potential crash