Fix  Issue #57