Fix issue #12