One more attempt to fix problem on issue #98