Fix issue #13