Fixed Issue #124.