Fix for data class