fix issue #51