Fixed issue #19