Fix Wrapped Companions

From issue #41