Crash fix. For real this time.