Fixed Issue #47.