issue #46 solved