Fixed issue #14
Fixed issue #14