Fix Companion object