Fixed Bug with list view