Implementation fix. Issue #311