Fix issue #27