Fixed crash because of changed structure