Data class fix