fixed issue #12