- fixed issue #36