Fix issue #30