issue #34 & issue #59