implemented issue #68