commit to issue #34