view fix
merge with develop