added magic for the list-view to work