Workaround for archive view put in place