diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.kt
index 16710879b..6087655d3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.kt
@@ -43,7 +43,7 @@ import java.util.*
 
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-open class AndroidCapability(@JvmField protected val ent: LivingEntity) : ICapabilityProvider, IAndroidCapability, INBTSerializable<CompoundTag?> {
+open class AndroidCapability(@JvmField protected val ent: LivingEntity) : ICapabilityProvider, IAndroidCapability, INBTSerializable<CompoundTag> {
 	@JvmField protected var battery = ImpreciseFraction.ZERO
 	@JvmField protected var maxBattery = ImpreciseFraction(60000)
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.kt
index 12164f46b..ddd72b899 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.kt
@@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import java.util.*
 
-interface IAndroidCapability : IMatteryEnergyStorage, INBTSerializable<CompoundTag?> {
+interface IAndroidCapability : IMatteryEnergyStorage, INBTSerializable<CompoundTag> {
 	fun tick()
 	fun tickClient()
 	fun getEntity(): LivingEntity