temp fix for view
merge temp fix