fixed data class some more