issue #46 and issue #47