Issue #258 fixing implementation