Issue #147 - Adapt to issue #52 changes