Changed to ensure correct view is returned