Crash fix with user comments.