Correction for issue #57.
Fixed issue #72.