Fixed Issue #51