Diary + crash fix