Fix for instance-based views