Add verification per view fix #2