Fixed Issue #47