Fixed Issue #121.