Implementation issue #97