+ fixed issue #21