Adding views to fix bug