moved to issue #96