Fixed issue #18