Fix issue #28