finish fix #96 for individual view