Companion on max fix