issue #59 solved