Fixes #1626: forgot Companion part (thanks Jenkins)