Fixed Issue #48