fixed issue #76.
Fixed issue #77.