Issue #863 fixed (Companion part done)