Fix case classes with active calculation