Issue #147 - Adapt to issue #41 changes