Adopt to Kotlin code generation change