Fixed new broken by views bug