Commit to fix updating ListView problems