Issue #57 fixed