Avoids the crash in Companion