Hot hack to CiviCore to fix views