Fixed Issue #14.