Issue #468 fixing implementation issues