Fixed crash #225