issue #98, issue #97, issue#96