Fix issue #11