Fixed crash on deletion of second item.
Merge remote-tracking branch 'origin/master'