Slightly more crash-proof