Partially fixed issue #13