Fixed Issue #63.