Companion fix