Fixed bug with new view holder pattern