Issue #857 - Offset Companion conversion fixed