Fixed issue #30