fix urgent issue #51