Fixed Issue #46.