Fixed Issue #54