Fix  Issue #57.