Fixed crash last commit