Fix issue #24