temp fix class mutations