Fixed issue #14