ListView BugFix

Change-Id: I2e96f3113bed884656b8bb91db11724d9b49ad0b